From d66ec165a28747c1b556696c6702f19da2037165 Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@gmail.com>
Date: Sat, 12 Nov 2011 22:17:15 +0000
Subject: [PATCH] Move delgpl, garmin_gpi tests into their own entries.

---
 gpsbabel/testo.d/classic-2.test  |  9 ---------
 gpsbabel/testo.d/classic-4.test  | 17 -----------------
 gpsbabel/testo.d/delgpl.test     |  8 ++++++++
 gpsbabel/testo.d/garmin_gpi.test | 22 ++++++++++++++++++++++
 4 files changed, 30 insertions(+), 26 deletions(-)
 create mode 100644 gpsbabel/testo.d/delgpl.test
 create mode 100644 gpsbabel/testo.d/garmin_gpi.test

diff --git a/gpsbabel/testo.d/classic-2.test b/gpsbabel/testo.d/classic-2.test
index 9dba60b2b..ee2670bbf 100755
--- a/gpsbabel/testo.d/classic-2.test
+++ b/gpsbabel/testo.d/classic-2.test
@@ -141,15 +141,6 @@ gpsbabel -t -i saroute -f ${REFERENCE}/track/i65.anr -o gpx -F ${TMPDIR}/gpl1.gp
 gpsbabel -t -i gpx -f ${REFERENCE}/track/i65.anr.gpx -o gpx -F ${TMPDIR}/gpl2.gpx
 compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
 
-#
-# Delorme GPL file.   This is sort of a track format.
-#
-rm -f ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx ${TMPDIR}/gpl1.gpl
-gpsbabel -t -i gpl -f ${REFERENCE}/track/webpark1.gpl -o gpx -F ${TMPDIR}/gpl1.gpx
-gpsbabel -t -i gpl -f ${REFERENCE}/track/webpark1.gpl -o gpl -F ${TMPDIR}/gpl1.gpl
-gpsbabel -t -i gpl -f ${TMPDIR}/gpl1.gpl -o gpx -F ${TMPDIR}/gpl2.gpx
-compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
-
 #
 # NetStumbler Summary File (read-only)
 #
diff --git a/gpsbabel/testo.d/classic-4.test b/gpsbabel/testo.d/classic-4.test
index ee463af5a..abeaa070b 100755
--- a/gpsbabel/testo.d/classic-4.test
+++ b/gpsbabel/testo.d/classic-4.test
@@ -1,21 +1,4 @@
 #!/bin/sh
-#
-# Garmin Points of Interest "garmin_gpi" (.gpi)
-#
-gpsbabel -i garmin_gpi -f ${REFERENCE}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi.gpx
-compare ${REFERENCE}/garmin_gpi.gpx ${TMPDIR}/garmin_gpi.gpx
-gpsbabel -i gpx -f ${REFERENCE}/garmin_gpi.gpx -o garmin_gpi -F ${TMPDIR}/garmin_gpi.gpi
-gpsbabel -i garmin_gpi -f ${TMPDIR}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi2.gpx
-compare ${REFERENCE}/garmin_gpi2.gpx ${TMPDIR}/garmin_gpi2.gpx
-gpsbabel -i gpx -f ${REFERENCE}/track/vitovtt-sample.gpx -x transform,wpt=trk -o garmin_gpi -F ${TMPDIR}/garmin_gpi3a.gpi
-gpsbabel -i garmin_gpi -f ${TMPDIR}/garmin_gpi3a.gpi -o garmin_gpi -F ${TMPDIR}/garmin_gpi3b.gpi
-bincompare ${TMPDIR}/garmin_gpi3a.gpi ${TMPDIR}/garmin_gpi3b.gpi
-gpsbabel -i garmin_gpi -f ${REFERENCE}/gpi_ext-sample.gpi -o unicsv -F ${TMPDIR}/gpi_ext-sample.csv
-compare ${REFERENCE}/gpi_ext-sample.csv ${TMPDIR}/gpi_ext-sample.csv
-# Don't test writing this sample file from garminonline.de/extras/poi, but 
-# prove we can read it
-gpsbabel -i garmin_gpi -f ${REFERENCE}/umsonstdraussen.gpi -o gpx,gpxver=1.1 -F ${TMPDIR}/umsonstdraussen.gpx
-compare ${REFERENCE}/umsonstdraussen.gpx ${TMPDIR}/umsonstdraussen.gpx
 
 #
 # Nokia  LMX
diff --git a/gpsbabel/testo.d/delgpl.test b/gpsbabel/testo.d/delgpl.test
new file mode 100644
index 000000000..e524b65ec
--- /dev/null
+++ b/gpsbabel/testo.d/delgpl.test
@@ -0,0 +1,8 @@
+#
+# Delorme GPL file.   This is sort of a track format.
+#
+rm -f ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx ${TMPDIR}/gpl1.gpl
+gpsbabel -t -i gpl -f ${REFERENCE}/track/webpark1.gpl -o gpx -F ${TMPDIR}/gpl1.gpx
+gpsbabel -t -i gpl -f ${REFERENCE}/track/webpark1.gpl -o gpl -F ${TMPDIR}/gpl1.gpl
+gpsbabel -t -i gpl -f ${TMPDIR}/gpl1.gpl -o gpx -F ${TMPDIR}/gpl2.gpx
+compare ${TMPDIR}/gpl1.gpx ${TMPDIR}/gpl2.gpx
diff --git a/gpsbabel/testo.d/garmin_gpi.test b/gpsbabel/testo.d/garmin_gpi.test
new file mode 100644
index 000000000..8b9da3b59
--- /dev/null
+++ b/gpsbabel/testo.d/garmin_gpi.test
@@ -0,0 +1,22 @@
+#
+# Garmin Points of Interest "garmin_gpi" (.gpi)
+#
+gpsbabel -i garmin_gpi -f ${REFERENCE}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi.gpx
+compare ${REFERENCE}/garmin_gpi.gpx ${TMPDIR}/garmin_gpi.gpx
+
+gpsbabel -i gpx -f ${REFERENCE}/garmin_gpi.gpx -o garmin_gpi -F ${TMPDIR}/garmin_gpi.gpi
+gpsbabel -i garmin_gpi -f ${TMPDIR}/garmin_gpi.gpi -o gpx -F ${TMPDIR}/garmin_gpi2.gpx
+compare ${REFERENCE}/garmin_gpi2.gpx ${TMPDIR}/garmin_gpi2.gpx
+
+gpsbabel -i gpx -f ${REFERENCE}/track/vitovtt-sample.gpx -x transform,wpt=trk -o garmin_gpi -F ${TMPDIR}/garmin_gpi3a.gpi
+gpsbabel -i garmin_gpi -f ${TMPDIR}/garmin_gpi3a.gpi -o garmin_gpi -F ${TMPDIR}/garmin_gpi3b.gpi
+bincompare ${TMPDIR}/garmin_gpi3a.gpi ${TMPDIR}/garmin_gpi3b.gpi
+
+gpsbabel -i garmin_gpi -f ${REFERENCE}/gpi_ext-sample.gpi -o unicsv -F ${TMPDIR}/gpi_ext-sample.csv
+compare ${REFERENCE}/gpi_ext-sample.csv ${TMPDIR}/gpi_ext-sample.csv
+
+# Don't test writing this sample file from garminonline.de/extras/poi, but 
+# prove we can read it
+gpsbabel -i garmin_gpi -f ${REFERENCE}/umsonstdraussen.gpi -o gpx,gpxver=1.1 -F ${TMPDIR}/umsonstdraussen.gpx
+compare ${REFERENCE}/umsonstdraussen.gpx ${TMPDIR}/umsonstdraussen.gpx
+
-- 
2.30.2